g_return_if_fail() if path is NULL. (gtk_ui_manager_get_node): Avoid a

2003-09-01  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.c (gtk_ui_manager_get_widget)
	(gtk_ui_manager_get_action): g_return_if_fail() if
	path is NULL.
	(gtk_ui_manager_get_node): Avoid a segfault if path is empty.
	(gtk_ui_manager_finalize): Remove the idle on finalize. (#121125,
	Marco Pesenti Gritti)

diff --git a/ChangeLog b/ChangeLog
index 2b49d007960abe90de023f42285a0b76755e05f5..3271376e970da71c9027f02dac2238571303f516 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_get_widget) 
+       (gtk_ui_manager_get_action): g_return_if_fail() if
+       path is NULL.
+       (gtk_ui_manager_get_node): Avoid a segfault if path is empty.
+       (gtk_ui_manager_finalize): Remove the idle on finalize. (#121125, 
+       Marco Pesenti Gritti)
+
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktoolitem.c: Fix some typos in docs.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2b49d007960abe90de023f42285a0b76755e05f5..3271376e970da71c9027f02dac2238571303f516 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2003-09-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_get_widget) 
+       (gtk_ui_manager_get_action): g_return_if_fail() if
+       path is NULL.
+       (gtk_ui_manager_get_node): Avoid a segfault if path is empty.
+       (gtk_ui_manager_finalize): Remove the idle on finalize. (#121125, 
+       Marco Pesenti Gritti)
+
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktoolitem.c: Fix some typos in docs.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2b49d007960abe90de023f42285a0b76755e05f5..3271376e970da71c9027f02dac2238571303f516 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2003-09-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_get_widget) 
+       (gtk_ui_manager_get_action): g_return_if_fail() if
+       path is NULL.
+       (gtk_ui_manager_get_node): Avoid a segfault if path is empty.
+       (gtk_ui_manager_finalize): Remove the idle on finalize. (#121125, 
+       Marco Pesenti Gritti)
+
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktoolitem.c: Fix some typos in docs.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2b49d007960abe90de023f42285a0b76755e05f5..3271376e970da71c9027f02dac2238571303f516 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2003-09-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_get_widget) 
+       (gtk_ui_manager_get_action): g_return_if_fail() if
+       path is NULL.
+       (gtk_ui_manager_get_node): Avoid a segfault if path is empty.
+       (gtk_ui_manager_finalize): Remove the idle on finalize. (#121125, 
+       Marco Pesenti Gritti)
+
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktoolitem.c: Fix some typos in docs.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2b49d007960abe90de023f42285a0b76755e05f5..3271376e970da71c9027f02dac2238571303f516 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2003-09-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_get_widget) 
+       (gtk_ui_manager_get_action): g_return_if_fail() if
+       path is NULL.
+       (gtk_ui_manager_get_node): Avoid a segfault if path is empty.
+       (gtk_ui_manager_finalize): Remove the idle on finalize. (#121125, 
+       Marco Pesenti Gritti)
+
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktoolitem.c: Fix some typos in docs.

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index d27bbf8cddb51ef23b15f3b52ff8198671e10c93..89ceb34e0a369af132c8cd77ca057e64c3d66978 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -104,6 +104,7 @@ struct _NodeUIReference
 
 static void   gtk_ui_manager_class_init    (GtkUIManagerClass *class);
 static void   gtk_ui_manager_init          (GtkUIManager      *self);
+static void   gtk_ui_manager_finalize      (GObject *object);
 static void   gtk_ui_manager_set_property  (GObject         *object,
                                            guint            prop_id,
                                            const GValue    *value,
@@ -192,6 +193,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
     merge_node_chunk = g_mem_chunk_create (GtkUIManagerNode, 64,
                                           G_ALLOC_AND_FREE);
 
+  gobject_class->finalize = gtk_ui_manager_finalize;
   gobject_class->set_property = gtk_ui_manager_set_property;
   gobject_class->get_property = gtk_ui_manager_get_property;
 
@@ -277,6 +279,18 @@ gtk_ui_manager_init (GtkUIManager *self)
   gtk_ui_manager_node_prepend_ui_reference (NODE_INFO (node), merge_id, 0);
 }
 
+static void
+gtk_ui_manager_finalize (GObject *object)
+{
+  GtkUIManager *self = GTK_UI_MANAGER (object);
+  
+  if (self->private_data->update_tag != 0)
+    {
+      g_source_remove (self->private_data->update_tag);
+      self->private_data->update_tag = 0;
+    }
+}
+
 static void
 gtk_ui_manager_set_property (GObject         *object,
                             guint            prop_id,
@@ -500,6 +514,7 @@ gtk_ui_manager_get_widget (GtkUIManager *self,
   GNode *node;
 
   g_return_val_if_fail (GTK_IS_UI_MANAGER (self), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
 
   /* ensure that there are no pending updates before we get the
    * widget */
@@ -536,6 +551,7 @@ gtk_ui_manager_get_action (GtkUIManager   *self,
   GNode *node;
 
   g_return_val_if_fail (GTK_IS_UI_MANAGER (self), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
   
   /* ensure that there are no pending updates before we get
    * the action */
@@ -666,7 +682,7 @@ gtk_ui_manager_get_node (GtkUIManager        *self,
       parent = node;
     }
 
-  if (NODE_INFO (node)->type == GTK_UI_MANAGER_UNDECIDED)
+  if (node != NULL && NODE_INFO (node)->type == GTK_UI_MANAGER_UNDECIDED)
     NODE_INFO (node)->type = node_type;
   return node;
 }